Handle character positions in UTF-8 strings correctly. (#133315, Theppitak

Fri Feb  6 22:38:54 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcombo.c (gtk_combo_entry_key_press): Handle character
	positions in UTF-8 strings correctly.  (#133315, Theppitak
	Karoonboonyanan)

diff --git a/ChangeLog b/ChangeLog
index 4e7d64d2f7f090a0e20965425e6983a0fe5682c7..a41fa5200aeb80a64594be6c9ba389751c74618c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb  6 22:38:54 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_entry_key_press): Handle character 
+       positions in UTF-8 strings correctly.  (#133315, Theppitak 
+       Karoonboonyanan)
+
 2004-02-06  Morten Welinder  <terra@gnome.org>
 
        * gtk/gtktoolbar.c (show_menu): Cleanup using

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4e7d64d2f7f090a0e20965425e6983a0fe5682c7..a41fa5200aeb80a64594be6c9ba389751c74618c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Feb  6 22:38:54 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_entry_key_press): Handle character 
+       positions in UTF-8 strings correctly.  (#133315, Theppitak 
+       Karoonboonyanan)
+
 2004-02-06  Morten Welinder  <terra@gnome.org>
 
        * gtk/gtktoolbar.c (show_menu): Cleanup using

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4e7d64d2f7f090a0e20965425e6983a0fe5682c7..a41fa5200aeb80a64594be6c9ba389751c74618c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Feb  6 22:38:54 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_entry_key_press): Handle character 
+       positions in UTF-8 strings correctly.  (#133315, Theppitak 
+       Karoonboonyanan)
+
 2004-02-06  Morten Welinder  <terra@gnome.org>
 
        * gtk/gtktoolbar.c (show_menu): Cleanup using

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4e7d64d2f7f090a0e20965425e6983a0fe5682c7..a41fa5200aeb80a64594be6c9ba389751c74618c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Feb  6 22:38:54 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_entry_key_press): Handle character 
+       positions in UTF-8 strings correctly.  (#133315, Theppitak 
+       Karoonboonyanan)
+
 2004-02-06  Morten Welinder  <terra@gnome.org>
 
        * gtk/gtktoolbar.c (show_menu): Cleanup using

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4e7d64d2f7f090a0e20965425e6983a0fe5682c7..a41fa5200aeb80a64594be6c9ba389751c74618c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Feb  6 22:38:54 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcombo.c (gtk_combo_entry_key_press): Handle character 
+       positions in UTF-8 strings correctly.  (#133315, Theppitak 
+       Karoonboonyanan)
+
 2004-02-06  Morten Welinder  <terra@gnome.org>
 
        * gtk/gtktoolbar.c (show_menu): Cleanup using

diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index bf7f96c3682668c2e02df2431544804eba0b42a8..51bb60283296899b62f3b63af4243664c6d82a06 100644 (file)
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -227,7 +227,7 @@ gtk_combo_entry_key_press (GtkEntry * entry, GdkEventKey * event, GtkCombo * com
 
       if (nprefix && strlen (nprefix) > strlen (prefix)) 
        {
-         gtk_editable_insert_text (editable, nprefix + pos, 
+         gtk_editable_insert_text (editable, g_utf8_offset_to_pointer (nprefix, pos), 
                                    strlen (nprefix) - strlen (prefix), &pos);
          gtk_editable_set_position (editable, pos);
        }